Remove `eww-colorize-region'

(eww-colorize-region): Remove duplicate function.
(eww-tag-body): Use `shr-colorize-region'.

eww compilation warning fix

(url-queue): Require `url-queue' to avoid compilation warning.

Make eww display PDFs inline

* net/eww.el (eww-display-html): Clear `url-queue'.
(eww-display-pdf): New function.
(eww-render): Display PDFs with `doc-view'.

* INSTALL: Remove univeral binary section.

* net/eww.el (eww-list-bookmarks): Autoload.

Add missing ChangeLog entry from previous checkin

* net/shr.el (shr-retransform-dom): Allow several text sub-nodes.

Make titles in eww prettier

(eww-tag-title): Remove newlines and extra whitespace from the
displayed title.

Fix `eww-display-html' bug when passed an explicit DOM

(eww-display-html): Don't try to decode the text if we've been
passed in a pre-parsed DOM.

Have `R' in eww save the history

(eww-readable): Save the history before displaying so that we can
go back to the non-readable version.

Fix charset problems with the `R' command in eww

* net/eww.el (eww-display-html): The charset is called `utf-8',
not `utf8'.
(eww-readable): Decode the saved text correctly.

Add a new, somewhat experimental "readability" command to eww

* net/eww.el (eww-readable): New command and keystroke.

* net/shr.el (shr-retransform-dom): New function.

Fix `eww-current-source' buffer confustion

* net/eww.el (eww-display-html): Set `eww-current-source' in the
correct buffer.
(eww-view-source): Use it.

ChangeLog: Add bug numbers.

* net/eww.el (eww): Recognize colon-delimited IPv6 addresses..

* net/eww.el (eww-submit): Encode empty form values as "".

* net/eww.el (eww): Allow "file:/file/name" URLs.

* net/eww.el (eww-mode-map): Remove mentions of `eww-quit'.

Fix memory leak

* nsimage.m (allocInitFromFile:): Initialize bmRep.
(dealloc): Release bmRep.

* nsimage.m (ImageList, imageListNext, imageListSetNext:)
(reference): Remove.
(allocInitFromFile:): Remove searching ImageList and calling
reference.
(dealloc): Remove handling if ImageList.

* nsterm.h (EmacsImage): Remove imageListNext, refCount, reference,
imageListSetNext, imageListNext.

Fixes: debbugs:18918

Fix incorrect assertion

* process.c (catch_child_signal): Fix incorrect assertion.

Fix bug #18897 with printing large objects from eieio.el.

 lisp/emacs-lisp/eieio.el (eieio-edebug-prin1-to-string): Adjust
 for use as advice.
 (edebug-setup-hook): Advise `edebug-prin1-to-string'.

* lisp/emacs-lisp/pp.el (pp-macroexpand-expression): Use macroexpand-1.
* lisp/progmodes/elisp-mode.el (emacs-lisp-macroexpand): Idem.

Fixes: debbugs:18821

sql.el (sql-mode-oracle-font-lock-keywords): Correct regexp
syntax, add new keywords, and parse longer keywords first.
(sql-redirect-one): Protect against empty command.
(sql-mode, sql-interactive-mode): Set `custom-mode-group\' property

* sql.el (sql-interactive-mode, sql-stop): Correct fix for
Bug#16814 with let-bind of comint-input-ring variables around read
and save functions.

Clean up merge conflict.

* macfont.m (macfont_draw):
* nsterm.m (ns_mouse_position, judge): Clean up merge conflict.

Merge from emacs-24; up to 117656

ChangeLog simplification

Fix ChangeLog typo

* net/tramp-cache.el (tramp-get-file-property)
(tramp-set-file-property): Check, that `tramp-cache-get-count-*'
and `tramp-cache-set-count-*' are bound.  Otherwise, there might
be compiler warnings.

* net/tramp-sh.el (tramp-get-remote-uid, tramp-get-remote-gid):
Return -1 respective "UNKNOWN", if uid or gid cannot be determined.

Make blink-parens work with a closing template delimiter.
progmodes/cc-cmds.el (c-electric-lt-gt): Cause a redisplay
before calling blink-paren-function, so as to apply syntax-table
properties to the ">".

Ignore BUFFER_SWITCH_EVENT events for the purposes of input-pending-p.

 src/keyboard.c (readable_events): When FLAGS include
 READABLE_EVENTS_FILTER_EVENTS, ignore BUFFER_SWITCH_EVENT events.
 This avoids returning non-nil from input-pending-p when only such
 events are in the queue.

Fixes: debbugs:18856

Fix bug #18856 with failure to fontify compilation buffers.

 lisp/progmodes/compile.el (compilation-mode): Turn off deferred
 fontifications locally.

* net/tramp-sh.el (tramp-send-command): Fix the case where the
remote-echo connection property is non-nil.

Fixes: debbugs:18858

Backport Tramp changes from trunk.

* net/tramp-adb.el (tramp-adb-sh-fix-ls-output): Use `bolp'.
(tramp-adb-handle-write-region): Improve messages.
(tramp-adb-maybe-open-connection): Don't set
`tramp-current-*' variables.

* net/tramp-cache.el (tramp-flush-file-function): Simplify check.
Suppress debug messages.

* net/tramp-ftp.el (top): Remove special handling for URL syntax.
(tramp-ftp-file-name-handler):

* net/tramp-gvfs.el (tramp-gvfs-methods) <sftp>: Add.
(tramp-gvfs-methods-mounttracker)
(tramp-gvfs-mountlocation-signature): Check `tramp-gvfs-enabled'
during initialization.
(tramp-gvfs-handle-delete-file): Flush file properties, not
directory properties.
(tramp-gvfs-handle-file-attributes): Use `string-to-number' when
reading "unix::mode".
(tramp-gvfs-handle-file-name-all-completions):
Use "-h" option for "gvfs-ls".
(tramp-gvfs-url-file-name): Apply `cons' where appropriate.
`user' and `localname' could be nil.
(tramp-gvfs-send-command): Simplify traces.

* net/tramp-sh.el (vc-handled-backends, vc-bzr-program)
(vc-git-program, vc-hg-program): Declare.
(tramp-methods) <sftp>: Remove.  It has never worked satisfactorily.
(tramp-methods) <nc>: Add new method.
(tramp-methods) <telnet>: Redirect stderr to "/dev/null".
(tramp-methods) <plink, plinkx, pscp, psftp>: Improve
`tramp-login-args'.
(tramp-default-user-alist): Add "nc".
(top): Remove completion function for "sftp".  Add completion
functions for "nc" and "psftp".
(tramp-sh-handle-set-visited-file-modtime):
(tramp-sh-handle-verify-visited-file-modtime): Use `point-at-eol'.
(tramp-do-copy-or-rename-file-out-of-band):
Use cached "remote-copy-args" value, if available.  (Bug#18199)
Tweak docstring.  Implement support for "nc" method.
(tramp-sh-handle-expand-file-name, tramp-local-coding-commands)
(tramp-remote-coding-commands, tramp-call-local-coding-command):
Tweak docstring.
(tramp-sh-handle-start-file-process): Expand `default-directory'.
(tramp-sh-handle-write-region): Tweak error message.
(tramp-sh-handle-vc-registered): Remove backends when the remote
binary does not exist.
(tramp-open-connection-setup-interactive-shell):
Prefer utf-8 coding.  (Bug#17859)
(tramp-find-inline-encoding): Do not raise an error.
(tramp-make-copy-program-file-name): Tweak docstring.  Handle also
the "nc" case.  Quote result also locally.
(tramp-get-remote-id): Check also for "gid".
(tramp-get-remote-python):

* net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-set-file-acl): Use `start-process'.
(tramp-smb-handle-insert-directory): Use progress reporter.
(tramp-smb-handle-rename-file): Flush also file properties of
FILENAME.

* net/tramp.el (tramp-methods): Tweak docstring.
(tramp-file-name-handler): Apply `cons' where appropriate.
(tramp-handle-file-accessible-directory-p): Check for
`file-readable-p' instead of `file-executable-p'.
(tramp-handle-shell-command): Use `display-buffer'.  (Bug#18326)
(tramp-handle-unhandled-file-name-directory): Return "/".
(tramp-check-cached-permissions):
Use `tramp-compat-file-attributes'.
(tramp-call-process): Add new argument VEC.  Adapt callees in all
tramp*.el files.

* net/trampver.el: Update release number.

nsselect.m cleanup, remove unused, declare vars static.

* nsselect.m (QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME)
(NXPrimaryPboard, NXSecondaryPboard): Declare static.
(Qforeign_selection): Remove.
(ns_get_local_selection): Identation fix.
(syms_of_nsselect): Remove Qforeign_selection, ns-lost-selection-hooks

* lisp/select.el (gui-get-selection): Comment: data-type ignored on NS.

* src/nsselect.m (ns_get_local_selection): Remove calling of
functions in Vselection_converter_alist.
(syms_of_nsselect): Remove Vselection_converter_alist.

Fixes: debbugs:18911

Auto-commit of loaddefs files.

Correct name on yesterday's patch "Add "enum classs" support to C++ mode."
to Daniel Colascione.

Auto-commit of loaddefs files.

* lisp/emacs-lisp/macroexp.el (macroexpand-1): New function.
(macroexp--expand-all): Unrelated tweaks.
* lisp/emacs-lisp/gv.el (gv-get): Use macroexpand-1.

Fixes: debbugs:18821

* lisp/simple.el (newline): Add assertions to try and help catch bug#18913.

* macfont.m (macfont_glyph_extents): Turn off syntetic bold
if force_integral_p (i.e. no antialias).
(macfont_draw): Check ns_antialias_text, also turn off syntetic
bold if no antialias.

Fixes: debbugs:18876

* lisp/emulation/cua-base.el (cua-delete-region): Use delete-active-region.
(cua--last-deleted-region-pos, cua--last-deleted-region-text): Remove.

Fixes: debbugs:18886

* emacs.c (main): Don't chdir to $HOME on Cocoa if --chdir was given.

Fixes: debbugs:18846

* font.c (copy_font_spec): Redesign to avoid Fcopy_alist
and unnecessary initialization.  Adjust comments.

admin/ChangeLog: Fix a typo.

Minor fixes in the changes in preparation for git migration.

 src/Makefile.in (repo-update): Fix a typo and slightly reword
 commentary.

 admin/notes/repo (Notes): Reword the stylistic guidance for commit log
 messages so that they are in line with Emacs development practices
 and style guidance.

Yet another change for git migration backported from trunk.

 lisp/version.el (emacs-bzr-version, emacs-bzr-get-version):
 Revert 2014-10-31 change.

Backport from trunk more changes in preparation for git migration.

 admin/notes/bzr: Renamed to notes/repo, reorganixed to separate
 VCS-dependent from VCS-independent stuff.  Added guidance about
 commit-comment format under DVCSes.
 admin/notes/BRANCH: Merged into notes/repo.

 lisp/version.el: Fix some fallback values to conform to the actual
 release number.

Backport changes in preparation for git migration from trunk.

 admin: Changes in several documents.
 autogen.sh: Neutralize language specific to a repository type.

 doc/misc/efaq-w32.texi: Neutralized language specific to a repository type.

 doc/misc/gnus-coding.txt: Neutralized language specific to a repository type.

 lisp/Makefile.in: Change some production names so they're neutral
 about the repository type.

* lisp/progmodes/vhdl-mode.el: Doc grammar fixes.

* etc/emacs.desktop: Add "Keywords".

* doc/man/emacsclient.1: Tiny markup fix

* lisp/startup.el (command-line): Remove pointless attempt to avoid statting fs
; which expand-file-name doesn't even do.

Restore cua-delete-copy-to-register-0 and M-v command.
* lisp/delsel.el (delete-selection-save-to-register)
(delsel--replace-text-or-position): New vars.
(delete-active-region): Use them.
(delete-selection-repeat-replace-region): New command, moved from
cua-base.el.
* lisp/emulation/cua-base.el (cua--repeat-replace-text): Remove var.
(cua-repeat-replace-region): Move command to delsel.el.
(cua--init-keymaps): Update binding accordingly.
(cua-mode): Set delete-selection-save-to-register.

Fixes: debbugs:18886

* nsfns.m (ns_set_doc_edited): Do all logic (check frames) here
instead of in xdisp.c, function now takes void.

* nsterm.h (ns_set_doc_edited): Declare taking no args.

* xdisp.c (prepare_menu_bars): Remove HAVE_NS code.
(redisplay_internal): Call ns_set_doc_edited if HAVE_NS (Bug#18884).

* nsfns.m (x_icon): icon_top/left is int.

* nsterm.h (EmacsScroller): Replace Lisp_Object win with
struct window*.
Remove getMouseMotionPart.
(ns_output): Make icon_top/left int.

* nsterm.m (ns_mouse_position): Remove unused code.
(initFrame:window:, dealloc): Use window instead of win.
(getMouseMotionPart:window:x:y:): Remove, unused.
(sendScrollEventAtLoc:fromEvent:): Make Lisp_Object win from window.

Fixes: debbugs:18889

Minor fix in bidi.c:bidi_cache_reset_to.

 src/bidi.c (bidi_cache_reset_to): Invalidate bidi_cache_last_idx by
 setting it to -1.
 (bidi_find_bracket_pairs): Pass to bidi_cache_reset_to a relative
 index, not an absolute one, as that's what the function expects.

Add "enum classs" support to C++ mode.
progmodes/cc-langs.el (c-after-brace-list-decl-kwds)
(c-after-brace-list-key): New language consts/variables.
progmodes/cc-engine.el (c-looking-at-decl-block): Exclude
spurious match of "enum struct" from decl-block recognition.
(c-backward-colon-prefixed-type): New function.
(c-backward-over-enum-header): Call above function to extend
recognition of enum structure.

* fontset.c (toplevel): Adjust comment to match 2014-06-19 change.

* xfaces.c (Finternal_set_lisp_face_attribute): Don't try to realize
font on an initial frame when running as a daemon (Bug#18869).

Update some version numbers for trunk version change

* src/unexmacosx.c (copy_data_segment): Port to GCC 4.6+ (backport)

Fixes: debbugs:9927

* NEWS: Remove items backported to NEWS.24

Merge from emacs-24; up to 117634

* lisp/progmodes/cc-defs.el (c--macroexpand-all): New function.
(c-lang-defconst):
* lisp/progmodes/cc-langs.el (c-make-init-lang-vars-fun): Use it.

Fixes: debbugs:18845

ChangeLog date fix

NEWS fixes

* doc/misc/efaq.texi (Gnus does not work with NNTP): Remove; ancient

* lisp/net/rcirc.el (rcirc-fill-column): Unbump :version.
A change in the possible :type with no change in the default does not
merit a :version bump.
Mark :risky.

* version.el (emacs-bzr-version, emacs-bzr-get-version): Revert 2014-10-26
change.

Fix bug #18874 with rgrep not obeying grep-scroll-output.

 lisp/progmodes/compile.el (compilation-start): If
 compilation-scroll-output is non-nil, don't force window-start of
 the compilation buffer to be at beginning of buffer.

Port current-time change to XEmacs 21.4.

See the buildbot log at:
http://www.randomsample.de:4456/builders/xemacs21.4-linux/builds/1285
* lisp/erc/erc.el (erc-emacs-time-to-erc-time)
(erc-emacs-time-to-erc-time):
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/org/org-compat.el (org-float-time):
Use 2-arg defalias, since XEmacs 21.4 doesn't support 3-arg.

Simplify use of current-time and friends.

* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.

* net/rcirc.el (rcirc-fill-column): Use function.
(rcirc-markup-fill): Remove adjustment.

doc/misc/calc.texi (Quick Calculator): Mention prefix argument of
`quick-calc'.

etc/NEWS: Mention prefix argument of `quick-calc'.

lisp/calc/calc.el (quick-calc):
lisp/calc/calc-aent.el (calc-do-quick-calc): New argument INSERT.

Allow any symbolic value for `rcirc-fill-column'.

* lisp/net/rcirc.el (rcirc-fill-column): Allow any symbolic value for
the sake of `window-body-width' (in addition to `frame-width').

xml.c:parse_region: Do not forget the first document child.

* src/xml.c (parse_region): Do not forget the first document child.

* test/automated/libxml-tests.el: New file.

Fix bug #18873 with non-ASCII characters in user's HOME directory.

 src/fileio.c (Fexpand_file_name): Use make_unibyte_string, not
 build_string, when importing a home directory.

[Backport] gnus.el (gnus-mode-line-buffer-identification):
Don't add image data for a non-graphic display;
Don't shadow load-path, it blocks autoloading of find-image (bug#18813)

lisp/gnus/gnus.el (gnus-mode-line-buffer-identification): Don't add image data for a non-graphic display (bug#18813)

[Backport] lisp/gnus/nnimap.el (nnimap-wait-for-response): Ignore NOOP response requested to keep connection open

Guidance on commit-comment formats.

More preparation for git tramsition.  Reorganize to sparate our dependencies.

* README.W32 (Preliminaries): Don't assume that this file is at
the top level.
(Setting up Emacs): Minor rewording to be more accurate.

Backported from trunk.

Fix some fallback values to conform to the actual release number.

* README.W32 (Preliminaries): Don't assume that this file is at
the top level.
(Setting up Emacs): Minor rewording to be more accurate.

Neutralize language specific to a VCS type.

Neutralize labguage specific to a VCS type.

Fix bug #18839 with incorrect image size returned by posn-at-point.

 src/dispnew.c (buffer_posn_from_coords): Use
 WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to
 account for the header-line height.

Neutralized language specific to a repository type.

Merge BRANCH into repo, because it belongs with the developer advice.  Also...

...this helps prepare for the repository move.

Neutralize some language specific to a repository type.

Rename the 'bzr' notes file to 'repo'.  For two reasons:

1. A significant portion of the advice is independent of any
specific version-control sytem.

2. Doing the rename now means it is easier to compose a multi-file
patch that can be applied to fix the tree on the day of the git move.

Looking for .bzr as a check for top-level directory will soon be a bad idea.

Fortunately the other two checks should be quite sufficient.

Neutralize some production names specific to a repository type.

Preparing foe git transition.

Next binary distribution will not contain .bzrignore files.

Removing this now to unclitter the grwp listings when I hunt for
obsolete references to bzr.

Neutralize language specific to a repository type.